projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dd5b7c d1338d7)
bitkeeper revision 1.827 (4062f482Cd9Dl1Z7ZYy0WJkJfqr-qQ)
authoriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Thu, 25 Mar 2004 15:02:26 +0000 (15:02 +0000)
committeriap10@tetris.cl.cam.ac.uk <iap10@tetris.cl.cam.ac.uk>
Thu, 25 Mar 2004 15:02:26 +0000 (15:02 +0000)
Merge tetris.cl.cam.ac.uk:/auto/homes/maw48/xen-syncpause.bk
into tetris.cl.cam.ac.uk:/auto/groups/xeno/users/iap10/xeno-clone/xeno.bk

1  2 
xen/common/dom0_ops.c patch | diff1 | diff2 | blob | history
xen/common/schedule.c patch | diff1 | diff2 | blob | history
xen/include/xen/sched.h patch | diff1 | diff2 | blob | history

diff --cc xen/common/dom0_ops.c
Simple merge
diff --cc xen/common/schedule.c
Simple merge
diff --cc xen/include/xen/sched.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.